Delete unused vars, misc warning cleanups.

diff --git a/gpsbabel/cetus.c b/gpsbabel/cetus.c
index 9ed9fd9332ac77e1f9d415e0fbbecefa296424d9..8443adaa4795fc8bfb873b1a8e31e26e0da0c614 100644 (file)
--- a/gpsbabel/cetus.c
+++ b/gpsbabel/cetus.c
@@ -122,7 +122,6 @@ data_read(void)
                wpt_tmp->position.latitude.degrees = pdb_read4(&rec->latitude) / 10000000.0; 
                if (rec->year != 0xff) {
                        struct tm tm = {0};
-                       time_t tval;
                
                        tm.tm_min = rec->min;
                        tm.tm_hour = rec->hour;

diff --git a/gpsbabel/csv.c b/gpsbabel/csv.c
index f97b2088786d0c60a511802392b18cda71c8d45f..abfef221bc213540018fbc376a954166142845ea 100644 (file)
--- a/gpsbabel/csv.c
+++ b/gpsbabel/csv.c
@@ -59,13 +59,9 @@ wr_deinit(void)
 static void
 data_read(void)
 {
-       char name[9], desc[80];
+       char desc[80];
        char *odesc = desc;
        double lat,lon;
-       char latdir, londir;
-       long alt; 
-       char alttype;
-       char icon[3] = {0};
        waypoint *wpt_tmp;
 
        while( fscanf(file_in, "%lf,%lf,%80[^\n]",
@@ -91,11 +87,6 @@ static void
 gpsutil_disp(waypoint *wpt)
 {
        double lon,lat;
-       signed int ilon, ilat;
-       const char *icon_token = "0";
-       char tbuf[1024];
-       char *tp = tbuf;
-       time_t tm = wpt->creation_time;
 
        lon = wpt->position.longitude.degrees;
        lat = wpt->position.latitude.degrees;

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index f6e97fa6f89570ad83567e7f4e569aca15c69053..9ca580c8537d9688c6e31ddac00701abca6e3bcb 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -111,6 +111,8 @@ void route_init(void);
 void waypt_disp(waypoint *);
 void fatal(const char *, ...);
 ff_vecs_t *find_vec(char *);
+void disp_vecs(void);
+
 
 void printposn(coord *c, int is_lat);
 

diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c
index d790975885c215d52b46b205ee66e3c9909bc863..3278ad6bdc5cfd3f7559aa7d43f9dad75d8f2c8a 100644 (file)
--- a/gpsbabel/gpspilot.c
+++ b/gpsbabel/gpspilot.c
@@ -191,7 +191,6 @@ abort();
        opdb->version = 0;
 }
 
-
 ff_vecs_t gpspilot_vecs = {
        rd_init,
        wr_init,

diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c
index dc249fe352e6144698dc197b6baeba484dcdec9f..fc52e436b2dd1f8bea5a220e0fc177ce1cc95018 100644 (file)
--- a/gpsbabel/magnav.c
+++ b/gpsbabel/magnav.c
@@ -204,12 +204,9 @@ compare(const void *a, const void *b)
 static void
 data_write(void)
 {
-       int i, ct = waypt_count();
-       struct hdr *htable, *bh;
+       int ct = waypt_count();
+       struct hdr *htable;
         queue *elem, *tmp;
-       extern queue waypt_head;
-        waypoint *waypointp;
-abort();
 
        if (NULL == (opdb = new_pdb())) { 
                fatal (MYNAME ": new_pdb failed\n");

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index 197dbddd0c88b39be4285c0f8f2ec72a1e0dfce0..a60a7a9bfa6ecf7537b997b098466c82e1e619dc 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -318,7 +318,7 @@ if (debug_serial)
                mag_error = 1;
                return;
        }
-       if (IS_TKN("$PMGNCMD,END") || is_file && feof(magfile_in)) {
+       if (IS_TKN("$PMGNCMD,END") || (is_file && (feof(magfile_in)))) {
                found_done = 1;
                return;
        } 

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index d5d9d0d9c87eec8f72f455f2f16fa4b46c13f380..0e4dd6e9606e69e93bfa3ae5c9acbe36d4a22568 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -38,7 +38,6 @@ test_endianness(void)
                 long l;
                 unsigned char uc[sizeof (long)];
         } u;
-        unsigned int i;
 
         u.l = 1;
         i_am_little_endian = u.uc[0];

diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index 932390c0a925845b1c7fbc613ea282811ade0f4a..c943a0322ff3a72f750034b626e1805c7261f7e1 100644 (file)
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -1,4 +1,6 @@
 #include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
 
 static const char vowels[] = "aeiouAEIOU";
 
@@ -18,8 +20,7 @@ static
 char *
 delete_last_vowel(int start, char *istring, int *replaced)
 {
-       int i,l;
-       char *ostring;
+       int l;
        
        /*
         * Basically impelement strrchr.
@@ -82,7 +83,7 @@ mkshort(char *istring)
        char *tstring;
        char *cp;
        char *np;
-       int i,j,l, nlen, replaced;
+       int i, l, nlen, replaced;
 
 
        if (!ostring) {